From a2ea6b7570bbe1370d9db7bea6d41a81d6ec8bed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 1 May 2008 00:37:20 +0000 Subject: [PATCH] =?utf8?q?=20=20=20=20=20=20=20=20Bug=20529386=20=E2=80=93?= =?utf8?q?=20Printing=20options=20hidden=20by=20blacklisted=20option?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * modules/printbackend/cups/gtkprintbackendcups.c (cups_printer_get_options): Fix the blacklist handling. Patch by Marek Kašík. svn path=/trunk/; revision=20058 --- ChangeLog | 8 ++++++++ modules/printbackends/cups/gtkprintbackendcups.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 280e038fcb..d1f90d8a72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-30 Matthias Clasen + + Bug 529386 – Printing options hidden by blacklisted option + + * modules/printbackend/cups/gtkprintbackendcups.c + (cups_printer_get_options): Fix the blacklist handling. + Patch by Marek Kašík. + 2008-04-30 Richard Hult * gdk/quartz/GdkQuartzView.c: Simplify check for zero sized expose diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index 113388a142..3c5e1844a2 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -2484,7 +2484,7 @@ cups_printer_get_options (GtkPrinter *printer, for (i = 0; i < num_opts; i++) { - if (STRING_IN_TABLE (opts->name, cups_option_blacklist)) + if (STRING_IN_TABLE (opts[i].name, cups_option_blacklist)) continue; name = get_option_name (opts[i].name); -- 2.30.2